No need to define errno defined at the top of reboot.c.

err2 is only needed when CONFIG_MAGIC_SYSRQ is defined.

Signed-off-by: Li Xin <xin.b.li@intel.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
index 944700069085f524b7a2292f0b9606634f0b0850..ecb547302e8370bc9ed3505d171afbeeeec87f68 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
@@ -1,7 +1,4 @@
-
 #define __KERNEL_SYSCALLS__
-static int errno;
-#include <linux/errno.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -309,7 +306,10 @@ static int setup_shutdown_watcher(struct notifier_block *notifier,
                                   unsigned long event,
                                   void *data)
 {
-    int err1=0, err2=0;
+    int err1 = 0;
+#ifdef CONFIG_MAGIC_SYSRQ
+    int err2 = 0;
+#endif
 
     down(&xenbus_lock);
     err1 = register_xenbus_watch(&shutdown_watch);